Remove conflict marker.

svn path=/trunk/; revision=18989

diff --git a/ChangeLog b/ChangeLog
index 1034e14374331a87dccd913d80bac1dd1221e474..8f78939b49f186c8c8032e39d5b2f25739145b6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,6 @@
        * gtk/gtkbuilder.c: Convert delayed_properties hashtable to linked
        list.  Fixes #495769.
 
->>>>>>> .r18986
 2007-11-10  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/buildertest.c: Parse a file given on the cmdline.